Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Mar 2024 09:18:53 +0000 (04:18 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Mar 2024 09:18:53 +0000 (04:18 -0500)
b9f7a2274f6 ; Improve documentation of 'minibuffer-allow-text-propert...
5ffcca121bb ; Improve documentation of image properties
6e801077ae8 ; * src/composite.c (composition_compute_stop_pos): Add c...

1  2 
doc/lispref/display.texi
doc/lispref/minibuf.texi
lisp/image.el
src/composite.c

Simple merge
Simple merge
diff --cc lisp/image.el
Simple merge
diff --cc src/composite.c
Simple merge